bitkeeper revision 1.248 (3ecbab33jT8L3qW_jJN1CGBY-pMq9w)

make html more robust

diff --git a/tools/control/README-xenctl b/tools/control/README-xenctl
index 379ef28e711f660759214dab76393640f01600ae..3ff9173ab200fd78801c5b867e7dcf6519d93a1e 100644 (file)
--- a/tools/control/README-xenctl
+++ b/tools/control/README-xenctl
@@ -3,9 +3,6 @@ some notes on configuring xenctl...
 
 to build:
 
- # edit xeno.bk/tools/control/build.properties
- # change manger.url to your xenoserver: mousetrap-0.xeno.cl.cam.ac.uk
- # change build.home to your xeno.bk path
  export PATH=/usr/groups/xeno/build_tools/bin:${PATH}
  # this next step has already been done.
  # cp $CATALINA_HOME/server/lib/catalina-ant.jar $ANT_HOME/lib
@@ -40,6 +37,9 @@ to run:
 
 
 for development:
+ ## edit xeno.bk/tools/control/build.properties
+ # change manger.url to your xenoserver: mousetrap-0.xeno.cl.cam.ac.uk
+ # change build.home to your xeno.bk full path 
  ## to "make install" in xeno.bk/tools/control  instead of copying the war file
  cp $CATALINA_HOME/conf/tomcat-users.xml $CATALINA_HOME/conf/tomcat-users.orig
  sed -e 's/<tomcat-users>/<tomcat-users>\\r  <role rolename="standard"\/>\\r  <role rolename="manager"\/>\\r  <user username="hobbes" password="tiger" roles="standard,manager"\/>/' $CATALINA_HOME/conf/tomcat-users.orig > $CATALINA_HOME/conf/tomcat-users.xml

diff --git a/tools/control/web/tmpl/dom-new.tmpl b/tools/control/web/tmpl/dom-new.tmpl
index f6af5e570b5da5ec5db4cf91717564d553b75758..b442b72537dee3d73808b66b35cb24246c803e84 100644 (file)
--- a/tools/control/web/tmpl/dom-new.tmpl
+++ b/tools/control/web/tmpl/dom-new.tmpl
@@ -156,7 +156,7 @@ INCLUDE&dommenu.tmpl
 </tr>
 <tr>
   <td></td>
-  <td align="right">virtual disk<input type="radio" checked name="root" value="vdisk"></td>
+  <td align="right">virtual disk<input type="radio" name="root" value="vdisk"></td>
   <td align="right">path</td>
   <td></td>
   <td><input type="text" size="40" name="vdisk" value="/dev/xvda1"></td>

diff --git a/tools/control/web/tmpl/vd-vbdd.tmpl b/tools/control/web/tmpl/vd-vbdd.tmpl
index 39b616364378a15926d804f4ba0553fb3c3ebea1..c15a173116b11315ea96171efc025df293c317ce 100644 (file)
--- a/tools/control/web/tmpl/vd-vbdd.tmpl
+++ b/tools/control/web/tmpl/vd-vbdd.tmpl
@@ -23,6 +23,10 @@ Not currently implemented.
 </tbody>
 </table>
 
+</td>
+</tbody>
+</table>
+
 
 
 

diff --git a/tools/control/web/tmpl/vd-vbdf.tmpl b/tools/control/web/tmpl/vd-vbdf.tmpl
index 5325fbb9ab914e340310e2fe1c46babff28b4d8f..0dbcc8d93dad208fe2499b87d36866340a00f80c 100644 (file)
--- a/tools/control/web/tmpl/vd-vbdf.tmpl
+++ b/tools/control/web/tmpl/vd-vbdf.tmpl
@@ -47,8 +47,14 @@ INCLUDE&vdmenu.tmpl
 <tr>
   <td><input type="submit" value="flush all vbds"></td>
 </tr>
+
+</td>
+</tbody>
+</table>
+
 </form>
 
+
 </td>
 </tbody>
 </table>